Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 17:38:40 +0000 (20:38 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 17:38:40 +0000 (20:38 +0300)

Trivial merge